Plug memory leaks. (#396160, Carlos Garcia Campos)

2007-01-13  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkselection.c (_gtk_selection_request): Plug
        memory leaks.  (#396160, Carlos Garcia Campos)

svn path=/trunk/; revision=17145

diff --git a/ChangeLog b/ChangeLog
index 843c0c172eddc964eac3cabcbd2185120bae01ee..0fd38f82fb7c4e8c3873d720f35378225bf90018 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkselection.c (_gtk_selection_request): Plug 
+       memory leaks.  (#396160, Carlos Garcia Campos)
+
 2007-01-13  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Link libgtk against Xfixes.  (#396074,

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 5a88069aab071f4ffcf730a9af982a0bc75748cc..080a1c32dc3955ee0f2b655a79decf42248a0753 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -2132,6 +2132,7 @@ _gtk_selection_request (GtkWidget *widget,
                                                 event->time);
          g_free (mult_atoms);
          g_free (info);
+          gdk_error_trap_pop ();
          return TRUE;
        }
       gdk_error_trap_pop ();
@@ -2168,6 +2169,8 @@ _gtk_selection_request (GtkWidget *widget,
              info->conversions[i].target = ((GdkAtom *)mult_atoms)[2*i];
              info->conversions[i].property = ((GdkAtom *)mult_atoms)[2*i+1];
            }
+
+         g_free (mult_atoms);
        }
     }
   else                         /* only a single conversion */